GtkEntryCompletion: Treat ::text-column specially
authorMatthias Clasen <mclasen@redhat.com>
Thu, 4 Sep 2014 02:44:31 +0000 (22:44 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 4 Sep 2014 02:46:38 +0000 (22:46 -0400)
Using the setting for this property conflicts with the documentation
for gtk_entry_completion_set_text_column() which explicitly states
that setting the property directly behaves differently. Concretely,
this caused the file chooser entry completion popup to have two
columns (with identical content).

This partially reverts 331c28b369edae9aa3df2a24833ccb02ef8d7152.

gtk/gtkentrycompletion.c

index 567ef689e23c20ed2d0d77809410640de5e9bbe1..5ab09d99f36b69527e6390afb785b0173227db80 100644 (file)
@@ -372,7 +372,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
+                                                     GTK_PARAM_READWRITE));
 
   /**
    * GtkEntryCompletion:inline-completion:
@@ -668,7 +668,7 @@ gtk_entry_completion_set_property (GObject      *object,
         break;
 
       case PROP_TEXT_COLUMN:
-        gtk_entry_completion_set_text_column (completion, g_value_get_int (value));
+        priv->text_column = g_value_get_int (value);
         break;
 
       case PROP_INLINE_COMPLETION: